From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 8 Jun 2013 17:33:58 +0000 (-0400)
Subject: main: Show a warning when gdm is missing
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~553
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7326e7a9fad0e82e137680ebcb0cdec81813003c;p=gnome-shell.git

main: Show a warning when gdm is missing

If we are not running under gdm, some functionaliy (such as
the lock screen) does not work, and we should inform the
user about this.

https://bugzilla.gnome.org/show_bug.cgi?id=701212
---

diff --git a/js/ui/main.js b/js/ui/main.js
index d8b0b9b6a..ab5aff0dc 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -268,6 +268,13 @@ function _initializeUI() {
                    _('Running a session as a privileged user should be avoided for security reasons. If possible, you should log in as a normal user.'));
         }
 
+        if (sessionMode.currentMode !== 'gdm' &&
+            sessionMode.currentMode !== 'initial-setup' &&
+            screenShield === null) {
+            notify(_('Screen Lock disabled'),
+                   _('Screen Locking requires the GNOME display manager.'));
+        }
+
         LoginManager.registerSessionWithGDM();
 
         let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");